Use the wide character version of ImmGetCompositionString() here, too.

2005-02-03  Tor Lillqvist  <tml@novell.com>

	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
	wide character version of ImmGetCompositionString() here,
	too. (#165278, Takuro Ashie)

diff --git a/ChangeLog b/ChangeLog
index 3cb44a3d2a37ad9ef77127414fd0176a618fd543..1564d3fe844acef07ad0e32dc4b6d8c115534360 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-03  Tor Lillqvist  <tml@novell.com>
+
+       * modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
+       wide character version of ImmGetCompositionString() here,
+       too. (#165278, Takuro Ashie)
+
 2005-02-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3cb44a3d2a37ad9ef77127414fd0176a618fd543..1564d3fe844acef07ad0e32dc4b6d8c115534360 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-02-03  Tor Lillqvist  <tml@novell.com>
+
+       * modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
+       wide character version of ImmGetCompositionString() here,
+       too. (#165278, Takuro Ashie)
+
 2005-02-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3cb44a3d2a37ad9ef77127414fd0176a618fd543..1564d3fe844acef07ad0e32dc4b6d8c115534360 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-02-03  Tor Lillqvist  <tml@novell.com>
+
+       * modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
+       wide character version of ImmGetCompositionString() here,
+       too. (#165278, Takuro Ashie)
+
 2005-02-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index 833cf160b571880de4c8e52ce03e7c76feb7aec5..615e6a1f60df06b8d7228f6acfb040c3f79a71d9 100644 (file)
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -446,9 +446,9 @@ get_pango_attr_list (GtkIMContextIME *context_ime, const gchar *utf8str)
       /*
        *  get attributes list of IME.
        */
-      len = ImmGetCompositionStringA (himc, GCS_COMPATTR, NULL, 0);
+      len = ImmGetCompositionStringW (himc, GCS_COMPATTR, NULL, 0);
       buf = g_alloca (len);
-      ImmGetCompositionStringA (himc, GCS_COMPATTR, buf, len);
+      ImmGetCompositionStringW (himc, GCS_COMPATTR, buf, len);
 
       /*
        *  schr and echr are pointer in utf8str.